James 3b80779fd3 Forward port #705, #708, and #710 ... Merge branch 'master' into hapi3_refactor		2017-08-13 12:31:09 -04:00
..
main	Forward port #705, #708, and #710	2017-08-13 12:31:09 -04:00
test	Forward port #688	2017-08-13 09:53:17 -04:00