Merging a stable version to master