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