Small bugfix related to the board reset function
Merge branch 'master' into gh-pages