Sync'd branch integration/fx-team with upstream @ Tue Aug 26 11:57:35 PDT 2014