Merge "More secure and compiler warning fix for sprintf into snprintf"