Really for reals
Merge remote-tracking branch 'writeable/master'