Sync with SVN - v5.1.2-stable release