Merge commit 'origin/master'

Conflicts:
	openbsc/src/vty_interface.c