fix #420
Merge branch 'master' into remotestorage0.9-develop