ref: 2cd6692a00c2af3644183b362ffc6dcaddc77981
parent: a0f4bae094d5724b78fe974770b74ccda42d1858
parent: 11f6bf9f168feba5672ee352a02fded0ce453215
author: Gabriel Ravier <gabravier@gmail.com>
date: Mon May 13 15:41:44 EDT 2019
Merge branch 'develop' into feature/makeFlagsMacros