Merging branch master into stable to align the two branches on github