Cleaning up package references
Merge branch 'master' into mathura_dev