Version 0.6.54
Merge remote-tracking branch 'origin/development' into production