Sync'd branch integration/fx-team with upstream @ Wed Sep 17 05:00:39 PDT 2014