- fix errors caused by -Wformat-security
- one more hunk
Start update to 20130530