Bug 913217
Bug 913217
Merge pull request #1474 from bdecoste/master

Bug 913217 895507 [merge]