[LyX/master] Merge branch 'master' of git.lyx.org:lyx

[Uwe Stöhr]

commit c62cad7a71bf6ee80afba8c9aca2fde7d4e1b10b
Merge: 41e928b 654f213
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Mon May 9 01:24:14 2016 +0200

    Merge branch 'master' of git.lyx.org:lyx