Sync'd branch integration/fx-team with upstream @ Wed Oct 29 05:42:38 PDT 2014