Merge branch 'patch-3' of https://github.com/olleolleolle/buildr