Merge branch 'master' into gnu-v6
Authored by: Empus 2018-05-05
Committed by: GitHub 2018-05-05
Parents: [41d3e2][6d2931]
Child: [ca93b6]