apply latest changes by  Archaeopteryx [:aryx]

See: https://bugzilla.mozilla.org/show_bug.cgi?id=20131028