Merge branch 'summary'
Bugfix
Merge branch 'master' into summary