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