Merge development into master

DO NAWT MERGE OR U WILL DIE. Kthx.