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