Sync'd branch integration/fx-team with upstream @ Thu Nov 13 01:11:56 PST 2014