Sync'd branch integration/fx-team with upstream @ Fri Sep 26 11:17:33 PDT 2014