Merge branch 'feature/make-powerline-happy' into develop