Revision e59fe16786537ae5fcce2b1f7e2eac1cef920a15

Committed on 15/01/2019 9:59 pm by Brookins Consulting <info@brookinsconsulting.com> [GitHub Diff]

Merge remote-tracking branch 'upstream/master'