Bug 861820 - Addressed comments from Fabien