Merge "Make -DUSE_DEFAULT_RESOURCE_DIR=OFF compile again" into devel/master