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

[Uwe Stöhr]

commit 0863b7e0fcf7d767d457ea3bdd4613a699209d6e
Merge: f69d5ab 701a100
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sun May 24 23:25:31 2015 +0200

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