Merge branch 'master' of krull:apc