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

[Uwe Stöhr]

commit 40aedb51466eb74f1b4ef54fad92dc47bab5f1cc
Merge: 6faa9b6 79a59fc
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Mon Apr 28 22:57:23 2014 +0200

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