Merge branch 'devel'
uhm, tags... :P
tags..
tags..
add logging to dict merge
Merge branch 'devel'
cleanup