Merge branch

I've been trying to send an email explaining all the changes for the past hour, though Mail.app seems unable to send it...