Fix for tablets #3
Merge branch '3_issue_tablets'