Sync'd branch integration/fx-team with upstream @ Tue Sep 16 11:05:52 PDT 2014