Merge tag 'v1.5.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Dec 2016 20:38:06 +0000 (15:38 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Dec 2016 20:38:06 +0000 (15:38 -0500)
Version 1.5.4


Trivial merge