Do not allow uncoditional tablet updates.
Merge branch 'master' into no-minus-1
Merge remote-tracking branch 'origin/master' into tablet3