Merge branch 'release/1.5.4' v1.5.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:24:30 +0000 (14:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:24:30 +0000 (14:24 -0500)
commit015035197a1f1abafcade56d1fcc538ceb0fdbcf
tree24e54d791ba195b7cf7a98bbbfb5414a49727eb8
parentb91cecd92860fa35adefa7475e14975cf2558fa5
parentbc8210e8ae11c39e4b571ee3e61750a52612098d
Merge branch 'release/1.5.4'