Merge of Gambini/libRocket