Setting up the master branch with 1.1.8 release code as the starting point.