Sync'd branch integration/fx-team with upstream @ Wed Sep 17 13:59:46 PDT 2014