Implement feature #1505

Signed-off-by: Umair Khan <omerjerk@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>