Merge branch 'master' of https://github.com/drmeister/clasp into devel
Merge branch 'devel' of https://github.com/drmeister/clasp into devel
Merge branch 'devel' of https://github.com/drmeister/clasp into devel
Merge branch 'master' into devel
ran analyzer
cleanup
merge
merged