Sync'd branch integration/fx-team with upstream @ Tue Sep 16 18:19:41 PDT 2014