Merge branch 'sdbugfixes'
Merge branch 'master' into sdbugfixes