Merge branch 'bug-2013-0614'
Bugfix-2013-0614