CORE-37 - Sloppy ReST markup... :-/