Fix compile error (refs #169)

Thanks @Mr-Bro for pointing that out.
Merge remote-tracking branch 'upstream/stable' into stable