Merge branch 'develop'
Make sure we don't crash. (Oops)
Created archive.
Auto commit bundle version stuff.
Merge branch 'master' into develop