merge niklasvh/html2canvas changes