Merge branch 'sup-heliotrope/develop' into maildir-sync