Bug 842913 - s/winstripe/windows in toolkit-makefiles.sh. r=Unfocused
Merge mozilla-central into mozilla-inbound