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)
commit9ac6c29a935a232fd4c94ce30d31c49ca7c62f05
tree158862cce7c17e00157c369037fedd4930fa00c9
parentff7364fa72bcf24ad8b1294e2df2b4b344e16094
parent7c7d16203dfe5f00ee08466850c0e68bf251d5b4
Merge tag 'v1.5.4' into develop

Version 1.5.4