jmoiron plays the blues

6a1b5b08 to gotk3 Merge remote-tracking branch 'upstream/master'