Sync'd branch integration/fx-team with upstream @ Fri Sep 26 15:12:46 PDT 2014