Add /etc/bbcarchdev-sandbox-version
Merge branch 'upstream'