Merge tag 'v1.0.16' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 14:02:10 +0000 (10:02 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 14:02:10 +0000 (10:02 -0400)
version 1.0.16


Trivial merge