Revision be1b5e8be2e884683325bb1c988309f03a5c201f

Committed on 31/10/2018 10:13 pm by Brookins Consulting <info@brookinsconsulting.com> [GitHub Diff]

Merge remote-tracking branch 'upstream/master'