Fix merge conflicts.
Merge branch 'joekiller-master'