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

[Uwe Stöhr]

commit 328dbe06026d5fef1ed663a7743daa4b62ccb3d0
Merge: 0fbd25a 6e6abe1
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Tue May 5 01:43:51 2015 +0200

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