Sync'd branch integration/fx-team with upstream @ Tue Sep 30 09:11:47 PDT 2014