Prevent a warning that something is undefined.
Merge branch 'pr/25'