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