Sync'd branch integration/fx-team with upstream @ Thu Nov 13 10:27:03 PST 2014