Update dependencies
Fix #7: don't retain template override
Update for release 3.5.4
Merge branch 'release/3.5.4' into dev