Merge branch 'dev'
track down a few more gemsource refs