ref: 1343e408b1de8dbdda956e26d56185e0b2dc32ab
parent: bce894210da1fecc16e1112dcacb62e39adf4364
parent: 5a2f98ece4c01ab02005ae9433447ab2781ce5d4
author: Gabriel Ravier <gabravier@gmail.com>
date: Tue May 14 04:15:43 EDT 2019
Merge branch 'master' into feature/makeFlagsMacros