Merge pull request #1241 from ProjectSWGCore/master

Merge to Experimental
Merge remote-tracking branch 'upstream/experimental' into experimental