Merge tag 'v1.5.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:19:40 +0000 (11:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:19:40 +0000 (11:19 -0500)
Version 1.5.5


Trivial merge