Merge current devel branch into feature/stretch: 2016-11 edition
Type of work:
Hi! Currently that merge has lots of conflicts in the test suite (that was heavily modified on both sides). IMO one of the first things we should do during next sprint is to handle this.