Clone
Andrew Dinn
committed
on 27 Apr 17
merge master branch into 4.0.0-BETA5 release