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