Sync'd branch integration/fx-team with upstream @ Wed Oct 15 14:33:43 PDT 2014