Sync'd branch integration/fx-team with upstream @ Tue Sep 30 17:20:42 PDT 2014