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