Merge branch 'refs/heads/master' of https://github.com/Ourobor/petulant-batman.git