Merge http://github.com/workhorsy/dolphin into cleanup_casting