Merge in 'thc-pptp-bruter'.

This was by far, the easiest merge so far.