Merged multiwallet (5bb560f) with master (bd85cf3).