Updates for b12a release.
Merge branch 'master' into sensoramd