Merge branch 'master' into live
authorAndrew Engelbrecht <andrew@fsf.org>
Wed, 2 Jan 2019 22:48:55 +0000 (17:48 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Wed, 2 Jan 2019 22:48:55 +0000 (17:48 -0500)
commit2e307b6e3a28c07ea1a20a4a6a6273ecdc6e704f
tree6f8b471e9a3961ad4fa389318aa69fd9ab15ca65
parente6616d44b0be1f1c70e6ea6a49db8669ab49ab2d
parent0cdb5d96d3d4fe6b16802a9ff24c7979b892a9b4
Merge branch 'master' into live

merge in ruben's commit