Merge 0.9.14 changes back to master.

This commit is contained in:
Nick Couchman
2017-12-12 13:58:31 -05:00
2 changed files with 708 additions and 708 deletions