commit 847a951b40d1355c7f18d8e91001ad9a1e5fc984 Merge: 8048dbd da00195 Author: Arturo Filastò <arturo@filasto.net> Date: Fri Aug 26 18:33:38 2016 +0200 Merge branch 'master' into v2.0.0-alpha * master: Don't look for the namebench csv file since we don't ship it