Commit 06-18-2013 @ 21h:15mm by dhekra