Sync'd branch integration/fx-team with upstream @ Thu Sep 11 13:57:38 PDT 2014