Merge branch 'stable-3.1'

Marius Burkard

2016-06-07 b63119417fe6e4bbcd072108d7dec927ee879d4a

install/dist/lib/ubuntu1604.lib.php does not exist in tree 69f03acf92e7d399298c229d0351820f677c9dc1