Updating forked Shopp 1.3.x branch