Merge branch 'hlintala-ruutu'