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