Sync'd branch integration/fx-team with upstream @ Sun Aug 31 11:45:33 PDT 2014