Merge tag 'v1.2.30' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 27 Oct 2016 15:45:51 +0000 (11:45 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 27 Oct 2016 15:45:51 +0000 (11:45 -0400)
Fixed shop page 404


Trivial merge