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