Sync'd branch integration/fx-team with upstream @ Fri Sep 19 18:10:20 PDT 2014