Sync'd branch integration/fx-team with upstream @ Tue Sep 16 10:58:51 PDT 2014