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