Merge tag 'v1.0.46' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 3 Dec 2015 21:23:43 +0000 (16:23 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 3 Dec 2015 21:23:43 +0000 (16:23 -0500)
Fixed broken image upload


Trivial merge