Sync'd branch integration/fx-team with upstream @ Wed Oct 22 00:56:45 PDT 2014