Comment 2 for bug 1427252

This will also need an installation-guide update to note the changes, also cherry-picking a commit from upstream (svn revision 69498)