Merged stable into dev.
Merged dev into master.