Sync'd branch integration/fx-team with upstream @ Thu Sep 11 14:46:51 PDT 2014