Sync'd branch integration/fx-team with upstream @ Fri Sep 26 10:58:34 PDT 2014