Merge branch 'bstable'

This commit is contained in:
ccd0 2017-10-08 19:20:22 -07:00
commit e4e7bbea7e