Merge tag 'v1.1.15' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 17:05:52 +0000 (13:05 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 17:05:52 +0000 (13:05 -0400)
Updated to version 1.1.5


Trivial merge