Sync'd branch integration/fx-team with upstream @ Sun Nov  2 21:29:47 PST 2014