Merge tag 'v1.0.48' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 19:34:27 +0000 (14:34 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 19:34:27 +0000 (14:34 -0500)
Updates to support additional add-on features


Trivial merge