bug 868441 Bypass Cache when lock held too long r=novotny
Bug 779029: Try to respect EXTEND_NONE when masking. r=jrmuizel

--HG--
extra : rebase_source : 0634d90f2c580fd4cc1ad73fb5b3406a6afda964