Merge commit '0e3f61b' into metabank

Conflicts:
	driver-bitfury.c