Clone
Andrew Dinn
committed
on 18 Apr 17
merge in changes from master branch