Containing allof the changes in the source code since the last binary release
Merging since github was complaining during the last push try