Sync'd branch integration/fx-team with upstream @ Thu Sep  4 01:29:35 PDT 2014