Merge branch 'excluded-code-review.marcomaggi-2018-10-21' (#230)