Merge branch 'hotfix/1.5.6' v1.5.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Jan 2017 17:27:26 +0000 (12:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Jan 2017 17:27:26 +0000 (12:27 -0500)
commitfb91dda52077dbb64951eac4b6e61e981ad498f7
tree3a42561bdd4ba07bb688ed3cae79d5bd7af1d1d8
parentd2f6cf41ee7fc6e7d68b5b107bdb9ba4509a7fe4
parent87527bd9803189509ec3a1283f3a10f1193f45e6
Merge branch 'hotfix/1.5.6'