Merge branch 'bstable'

This commit is contained in:
ccd0 2015-09-23 13:00:30 -07:00
commit 9854ab6d2b

File diff suppressed because one or more lines are too long