Merge branch 'master'; commit '6200a95' into stable/1.5
fix minor error in toggle mark
Merge branch 'stable/1.5'