Merge tag 'v2.0.12' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 27 Jun 2016 12:52:38 +0000 (08:52 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 27 Jun 2016 12:52:38 +0000 (08:52 -0400)
version 2.0.12


Trivial merge