Merge pull request #1745 from svenauhagen/bugfix/a8k