Merge tag 'v1.5.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:51:16 +0000 (11:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:51:16 +0000 (11:51 -0500)
commit0cb68aff7ca1ba6121645cbd39d048a8701a0122
tree56c484800fc61f4195e1432c6b95e1c5f03ca960
parentd60ca30c7f10e68f149ddb4bfdf11c8d962f3a28
parentb8ad205d7b360f36b5a3063a1a89b4059040a34b
Merge tag 'v1.5.4' into develop

Version 1.5.4