Merge branch 'stable'

latest commit 7e14063ebb
@eads eads authored