jrief Merge branch 'releases/0.12.x' into patch-2

Latest commit eaefd0f

Mar 18, 2018