jpokorny pushed to pacemaker (f23). "Merge branch 'master' into f23"