Merge pull request #1485 from mickeprag/master