merge latest from master (python3, users manual) for beta2