Resolving merge conflict; using default from JupiterJazz master branch
Merge branch 'master' of https://github.com/leonard7e/appleseed

I made a misstake in my last try to merge jupiter-jazz appleseed into my
own fork. So, I try to correct it now.