Francis Deslauriers comments

Results 3 comments of


                                            Francis Deslauriers

I updated the commit message but we will need to update it again when we come up with a fix.

This PR is for the stable-1.5 branch.

Thank you for the feedback, I addressed the style issues.