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