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