Syncing up package repo changes
Merge pull request #461 from khawkins/unstable

Syncing up package repo changes