Update to sprint 30
Merge pull request #982 from soney/patch-1

Update to sprint 30