Dumped "xhtml" output type from sample app and introduced a replacement, closes #802
merge 52b56eb555d5a4db13e429c0c49f20534e0b5f3a...fac7bccce4df68bc21f630d7ced1a8688c643aa5 (from 0.11)
merge 88ea8e79082eeedde1e5a5d3597b0809d5757c4c...f7f185ea037e548bde05e441edd411ca6993b55f (from master)