Bug 900114 (rollup)

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