Make sure nonce is always right
Merge branch 'develop'