Merge tag 'v2.0.7' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 31 Mar 2016 19:26:07 +0000 (15:26 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 31 Mar 2016 19:26:07 +0000 (15:26 -0400)
version 2.0.7


Trivial merge