Merge tag 'v1.2.15' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 23 Nov 2015 20:25:20 +0000 (15:25 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 23 Nov 2015 20:25:20 +0000 (15:25 -0500)
1.2.15


Trivial merge