Fix bug 1041566 - Lightning 3.5 broken with 2014-07-21 update (regression). r=ssitter,a=bustage

--HG--
extra : rebase_source : 64255e7a73b225583f23ba27727156779252ec8c