Super Hans, m8
Merge remote-tracking branch 'Github/master'
Resolved a conflict