PEP8
Merge remote-tracking branch 'timlinux/develop' into develop