Bugfix #795
Merge remote-tracking branch 'glorf/master'