Merge tag '1.2.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 17 Jan 2017 19:58:24 +0000 (14:58 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 17 Jan 2017 19:58:24 +0000 (14:58 -0500)
commit6e96a1ac47def940f448b386b8430c57e59a4060
tree8b8b657685b4ec103b3509f65bbc55988f4450c7
parent92ec573b59ecc15b8531402ec912042b78c6536b
parent4434bf87b1e3ff13d240d7e287d157d489ff472a
Merge tag '1.2.4' into develop

version 1.2.4