Merged branch master into jsd2