merged differences between git and 1.10-Source
Implemented -privatekey setting