Fix for #416.
Merge branch 'master' of https://github.com/owncloud/contacts.git