Merge branch 'dev' into beta
Authored by: Paul Bouquet 2018-07-03
Parents: [0caccd][16c559]
Child: [a96401]