Merge branch 'master' into config_file

Conflicts:
	openbsc/src/vty_interface.c
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.