Merge tag 'v1.5.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Jan 2017 17:21:49 +0000 (12:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Jan 2017 17:21:49 +0000 (12:21 -0500)
Version 1.5.5


Trivial merge