Merge tag 'v1.2.13' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 18 Nov 2016 15:52:17 +0000 (10:52 -0500)
committerIan Weller <ian@gaslightmedia.com>
Fri, 18 Nov 2016 15:52:17 +0000 (10:52 -0500)
version 1.2.13


Trivial merge