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

[Uwe Stöhr]

commit 9ba270462f29f4ddd913c3b02ed3154181803e62
Merge: 041a3ad bf24ea6
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sun May 24 17:03:24 2015 +0200

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