Merge branch 'issue788' into 1.7.x
The ignoreMissingResource parameter is now string and accepts null, meaning that the default value will be used.
fix merge conflicts