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