Sync'd branch integration/fx-team with upstream @ Tue Sep  9 14:54:48 PDT 2014