Merge branch 'origin/develop'

Conflicts:
	src/ripemd-hash.cpp
	src/unwrap.cpp
	src/wrap.cpp