Sync'd branch integration/fx-team with upstream @ Wed Sep 10 00:09:38 PDT 2014