Merge branch 'amok' into larchbell