Merge branch 'bug_307_fix_deepstandby_texts'