Merged r12302 from trunk to 2.4-stable (#15391, #15401)
Fix wiki syntax "bold italic".
Contributed by Karel Pičman.
Authored by: marutosijp 2013-11-19
Parent: [r12306]
Child: [r12308]