Merge branch 'release/1.5.4' v1.5.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Dec 2016 20:37:59 +0000 (15:37 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Dec 2016 20:37:59 +0000 (15:37 -0500)
commit7c7d16203dfe5f00ee08466850c0e68bf251d5b4
tree158862cce7c17e00157c369037fedd4930fa00c9
parentec7ccefc7ba277bed6740755e5b3114ffc44a21d
parentff7364fa72bcf24ad8b1294e2df2b4b344e16094
Merge branch 'release/1.5.4'