merges master into dedoz/master

review @dedoz