Merge branch 'develop' of git://github.com/squareproton/Bond into develop