Sync'd branch integration/fx-team with upstream @ Wed Nov 12 14:19:05 PST 2014