a substantial batch of bug fixes and small features improvements (see redmine)
Merge commit 'github/master'