Merge remote-tracking branch 'origin/master'

Conflicts:
	SketchPad/SketchPad.v11.suo