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