Merge changes from master into djKooks

djKooks authored
revision 33aaf403313c88ca86617d68734bd25908b2b2c6