Sync'd branch integration/fx-team with upstream @ Fri Sep 19 17:00:01 PDT 2014