Merge branch 'master' into dev
authorChris Koeritz <fred@gruntose.com>
Mon, 15 Jan 2018 16:35:34 +0000 (11:35 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 15 Jan 2018 16:35:34 +0000 (11:35 -0500)
commit02c681cf298b3ebe31b9d7898989dad822080cfc
tree94d0e9509dfc929feb698f6a1acba031e06959f2
parentc47ce5568e39c5fcb80ed2b5be997065f4f25979
parentdf45b967961679bb5a9f3a758499fde8d04efd64
Merge branch 'master' into dev

accidental checkin to master of a dev change, merging back.