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