rev 1c9c88fbf552b3737c7b97e1f243860359687976 Fixes #763 Change-Id: Ie1073de7d23179c33f387ef3477fa7ccea0c3952