Patch Set 5:

This change mirrors the last commit pushed to stable-1.2 that included changes based on Robin's feedback.

I would like to get started on the EGit side of things soon so any other feedback on this change would be appreciated.