Sync'd branch integration/fx-team with upstream @ Thu Sep  4 09:57:53 PDT 2014