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

[Uwe Stöhr]

commit f5648006fbd0c816488c6a9167b4787d1e3a839a
Merge: 9e87cf0 8c351e3
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Mon May 4 01:51:21 2015 +0200

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