Trying to merge latest upstream JADE into my own copy - if you're reading this and you're not me then I've done something wrong...

Trying to merge latest upstream JADE into my own copy - if you're reading this and you're not me then I've done something wrong...