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