Merge branch 'master' into kcc-fakepanelview
Apply PEP-8 codestyle