fix direct commits on master

This pull request highlights the commits eca7e5f performed directly to the master branch and the additional pull request for b63803e.