Sync'd branch integration/fx-team with upstream @ Tue Sep 30 12:08:40 PDT 2014