Merge branch 'devel' of h1dev:/srv/APKPM/