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