Merge branch 'anross-master'

* Tested PR#47
Pre-release specfile bump
Merge branch 'master' into devel