Merge branch 'master' of ssh://git.code.sf.net/p/feistymeow/trunk into dev