remove erroneous space
Merge branch 'encryption-key' into fooman