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