vakopian/jqcubed

__This needs to go into a new branch called f-jqcubed, not to master!__

This is from vakopian/jqcubed. I merged it with master and fixed some conflicts that were thankfully only comment conflicts, so no manual code merge occurred.