Included Kasper changes

http://meta.discourse.org/t/brand-new-plugin-interface/8793/61