Merge branch 'master' of github.com:csamuelson/stlink