Merge branch 'master' into dev
authorChris Koeritz <fred@gruntose.com>
Mon, 15 Jan 2018 16:48:06 +0000 (11:48 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 15 Jan 2018 16:48:06 +0000 (11:48 -0500)
commitfcfb763b7b0ee0276db0f0fca5e20b07961b04e8
tree563f94bb760285ae081a9d1f887cac08d518e359
parent02c681cf298b3ebe31b9d7898989dad822080cfc
parent24c0b2616ed766b908d187d7de9cbd594224c98f
Merge branch 'master' into dev

pulling in latest release into dev.
should only be the tag.  if that.