merge bug fixes from skulpt master