Sync'd branch integration/fx-team with upstream @ Thu Sep  4 11:17:39 PDT 2014