Merge branch 'master' into dev
dev.py: forgot to add the Exception with the code

Signed-off-by: Erik Bernoth <erik.bernoth@gmail.com>
Prepare Release 0.1.11

Signed-off-by: Erik Bernoth <erik.bernoth@gmail.com>
Merge Merge Revision 0.1.11