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