Merge branch 'for-15.05' of github.com:HRogge/packages into for-15.05