Sync'd branch integration/fx-team with upstream @ Fri Sep 26 13:44:41 PDT 2014