Merge branch 'dev' into beta
Authored by: Guillaume De Saint Martin 2018-06-02
Parents: [916249][9af540]
Child: [48e04b]