Merge branch 'hotfix/1.5.12' v1.5.12
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 15:54:29 +0000 (11:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 15:54:29 +0000 (11:54 -0400)
commitd529d0389fe1deacb672a9a43bda61cf67974a98
tree71ac9ccb8e9b15f55656e89ba47fa52b6427349e
parentcf9f39e5ddd067c919b686fe3471fbbe32444c6a
parenta9eb51da1e13e3c90a8d4899a61e652580ec68c2
Merge branch 'hotfix/1.5.12'