Merge "GCC compiler warning fix for sprintf into snprintf"