Jorge Ramirez-Ortiz authored Aug 26, 2015 and Philippe Gerum committed Feb 28, 2016

( merge of 3.18.20 port changes from "introduce arm64 support". -dm )