Sync'd branch integration/fx-team with upstream @ Tue Aug 26 16:00:25 PDT 2014