Merge branch 'feature-lastnonbotsubmit' into develop (fix #82)