v0.42 protected

Wouter Beugeling

@wbeugeling

09415ad2 · Merge develop to master · Nov 13, 2018

Bug fixes and minor updates