Merge tag 'v1.2.16' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 18:48:57 +0000 (13:48 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 18:48:57 +0000 (13:48 -0500)
Version 1.2.16


Trivial merge