Merge branch 'master' of https://github.com/therabbitmage/mightynarwhal
Merge branch 'master' into listactivity