Update to experimental r13565
Small cleanup
Experimental merge of Ponyscape features into trunk (will not compile)