Merge branch 'stable'

This commit is contained in:
Simon Quigley 2019-10-17 10:59:53 -05:00
commit dfa66ffdec