v2.6.4

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
Merge remote-tracking branch 'origin/2.6' into 2.7

Conflicts:
	VERSION
	debian/changelog