Correctly select include directories
Merge branch 'master' into rendering-2