Sync with lastest version from GitHub (851b8665aca7f5cc54f305f699333656a2406eeb).
Cleaning, removing of trailing whitespaces
Authored by: tchule@hotmail.com 2014-10-28
Parent: [r311]
Child: [r313]