2.1.5
fa825764 · Merge branch 'dialog-+-disable' into 'master' ·