Created by: hnrch02
See #13940 (closed).
Also removed some superfluous whitespace.
/cc @XhmikosR @cvrebert