A.21. Release 3.6.1

Release Date: 2016-12-26

A.21.1. Bug fixes