I have merged ZK-2014, many thanks to Michael for the work, that's an important issue for this project.
One thing missing with respect to ZK-2014 is documentation. The pull request contained doc changes, but I didn't want to mess with the work of the merge script so I haven't regenerated the docs. I'll do it separately, but for awareness, I want to make sure that we all know that it needs to happen. -Flavio
