Sync'd branch integration/fx-team with upstream @ Fri Sep 12 12:58:43 PDT 2014