Issue #2248175 by xjm: Add timplunkett as a maintainer for the plugin system.
Issue #2168321 by longwave, martin107: Several files have incorrect indentation.