Merge cracker64:jacob into wolfy1339:master