Merge branch 'next' into remove_matrix

Conflicts:
	src/maidsafe/vault/tests/vault_func_test.cc