Merge branch 'develop' into brewbakers brewbakers
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 18:21:14 +0000 (14:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 18:21:14 +0000 (14:21 -0400)

Trivial merge