miquels Merge branch 'jschwartzenberg-master'

Latest commit ea0f693

Jun 12, 2018