Merges of all current bug-NNN branches into the master

According to the [Workflow](https://github.com/qcubed/framework/wiki/Workflow), all accepted bugfixes should go directly to the master branch.