Sync'd branch integration/fx-team with upstream @ Fri Sep 26 10:02:42 PDT 2014