Cleared Git history, future pull requests must be formatted correctly. Please make sure the commit message is descriptive, well punctuated, and each pull request contains one commit of all changes.
Manual merge from C16-live (conna wiped history)