Sync'd branch integration/fx-team with upstream @ Tue Aug 26 13:14:43 PDT 2014