Merge branch 'release/2.8.5' v2.8.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 3 Jan 2017 19:12:19 +0000 (14:12 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 3 Jan 2017 19:12:19 +0000 (14:12 -0500)
commitd75132094ea7619b8662a81b7120eca000ea1a5a
tree7d669f061f706220393fce49360141b7bb471bac
parentea4d4cb05c9c8b0b947add64ebc4543f0de5447a
parent9960d0e2f986bc5144d19198da04a5065c86042e
Merge branch 'release/2.8.5'