Merge changes from rzwitserloot/master to jlahoda/master.