201307 prerelease changes
Merge branch 'master' of github.com:magos-linux/magos-linux