dev -> master

since the change needs to be included on tauris right away, I will push to master immediatly