adc50f7 Oct 5, 2017
@ylecollen ylecollen Merge remote-tracking branch 'origin/develop'
@ylecollen @oddvar @ara4n @lampholder