Merge branches 'backtrace-first-line' and 'non-string-array-values' into ifixit-production