Sync'd branch integration/fx-team with upstream @ Fri Sep 12 10:33:38 PDT 2014