Bugfix: Pierre's latest fixes for Lightroom to avoid occasional missing thumbnails
Merge branch 'refs/heads/master' into development
Merge branch 'refs/heads/master' into development