Merge branch 'master' into wip_alan_T5681_fix_bootstrap4_detection
authorAlan Knowles <alan@roojs.com>
Thu, 24 Jan 2019 07:07:50 +0000 (15:07 +0800)
committerAlan Knowles <alan@roojs.com>
Thu, 24 Jan 2019 07:07:50 +0000 (15:07 +0800)

Trivial merge