Bug 917485: trivial patch to test merging to production; r=Callek