NOTE: changes unrelated to Osmocom versions from master should be made against the 201705 branch, not the branch here! Change-Id: I7bcf0b88183696e1af61fc20bd4701fbdd7e582c