Merge branch 'master' into sqlalchemy - solved totally harmless