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