Merge remote branch 'upstream/master'

Conflicts:
	ST_MyQ_Device_Type.groovy
Merging changes