Merge inbound to mozilla-central r=merge a=merge

commit7476b71e0010ab3277b77cc0ae4d998c4b1d2b64
parent2abc965cbbe015c359707e6d1c053f140e361824
parent020e20e5356504633293e0e462596598639a9fd1
hgf5b4481c9fd50becb35cef02b599198b766fb1bb
git7476b71e0010ab3277b77cc0ae4d998c4b1d2b64
authorCsoregi Natalia <ncsoregi@mozilla.com>
committerCsoregi Natalia <ncsoregi@mozilla.com>
commit timeFri, 12 Jan 2018 23:59:06 +0200