Improved portability
auto-merge staging into master
xref
auto-merge staging into master