Merge master into develop

Merge master into develop. non-Dalli tests pass.