Update master branch with the latest releases from 'devel' #161

Closed captjt closed 8 years ago