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