Merge tag 'v1.5.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:24:38 +0000 (14:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:24:38 +0000 (14:24 -0500)
commita1c5ca53c07b7d9d8c16660993300c228909832c
tree24e54d791ba195b7cf7a98bbbfb5414a49727eb8
parentbc8210e8ae11c39e4b571ee3e61750a52612098d
parent015035197a1f1abafcade56d1fcc538ceb0fdbcf
Merge tag 'v1.5.4' into develop

Version 1.5.4