Fix empty FN. Related: #353
Merge branch 'stable6' of github.com:owncloud/contacts into stable6