Sync'd branch integration/fx-team with upstream @ Wed Nov 12 22:52:56 PST 2014