Merge branch 'release/1.5.3' v1.5.3
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Dec 2016 18:43:47 +0000 (13:43 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Dec 2016 18:43:47 +0000 (13:43 -0500)

Trivial merge