Merge branch 'master' into development/6.0.0

Authored by mqualmann on Mar 17 2018, 4:05 PM.

Description

Merge branch 'master' into development/6.0.0

Merged Changes

CommitAuthorDetailsCommitted
d7a4fdaf6075mqualmann
change toLocal8Bit() ==> toUtf8() in html gallery generator 
Mar 17 2018
4df757b913adcgilles
update 
Mar 17 2018