Merge branch 'unclear-bugfixes' into python3
fixed some python 3.3 forward compatibility issues as well as all remaining test failures