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