Sync master to 2016-patches

Rosen Matevrequested to merge
sync-2016-master into master

This is mostly to pick up all the fixes to the tests.

Merge request reports