Sync'd branch integration/fx-team with upstream @ Wed Nov 12 17:46:01 PST 2014