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)
commit3e6dd3300d5e738c97cc5570c00c646d4d4aff5f
tree8c5cdb88a58ed595536eab51179134ef26224536
parentb17415f10103dcb25eb588a34f001c2427a66d61
parentfd14db94b08410528475d72f9dd4e7593e930303
Merge tag 'v1.5.4' into develop

Version 1.5.4