v0.39 protected

Wouter Beugeling

@wbeugeling

0a908b5d · Merge develop to master · Sep 28, 2018

Bug fixes and small improvements