Merge branch 'idmclib-0.8.1'
treebd2728c9e085f6f3a9e0847264fbbb93b968bf33
drwxr-xr-x - RiDMC