Sync'd branch integration/fx-team with upstream @ Fri Sep 19 12:16:44 PDT 2014