PR: https://lists.opnsense.org/pipermail/devel/2017-March/000012.html (cherry picked from commit 264c5655)
