Sync'd branch integration/fx-team with upstream @ Fri Sep 26 16:32:42 PDT 2014