Merge tag 'v2.0.16' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 12:42:42 +0000 (08:42 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 12:42:42 +0000 (08:42 -0400)
version 2.0.16


Trivial merge