Improved kevin's rage level.
Matt Ryan Merge Conflicts
Merge branch 'Mr-Ick-master'