Merge 0.6 Into The Master

Thanks, but I'll probably just leave it as is for now, because I'm pretty sure to remember to change it after I merge it.