Sync'd branch integration/fx-team with upstream @ Fri Sep  5 08:01:35 PDT 2014