add option to getPixmap to include ancestor masks when generating layer images
Merge remote-tracking branch 'origin/master'