Couple of typos
Merge branch 'stable' into HEAD
Missing 'false' branch needed for 15fc052