Merge commit 'e5cce0504bd0dbc227c839297e3d164ef800cbc8' into moonshot-fr-3.0.12-upgrade
authorDan Breslau <dbreslau@painless-security.com>
Fri, 27 Jan 2017 20:59:01 +0000 (15:59 -0500)
committerDan Breslau <dbreslau@painless-security.com>
Fri, 27 Jan 2017 20:59:01 +0000 (15:59 -0500)
Fixes problem that causes dpkg-buildpackage to fail.


Trivial merge