Sync'd branch integration/fx-team with upstream @ Tue Sep  9 07:05:38 PDT 2014