Merge branch 'master' of github.com:jdpedrie/squeeze