Sync'd branch integration/fx-team with upstream @ Tue Sep  2 08:17:35 PDT 2014