master commit
Merge remote-tracking branch 'remotes/github/master' into 201401.1

Conflicts:
	DannyShayNET/DannyShayNET.v12.suo