Merge tag 'v1.5.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 18:52:18 +0000 (13:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 18:52:18 +0000 (13:52 -0500)
Version 1.5.4


Trivial merge