Merge pull request #1567 from vdanjean/master