PR: 147966 [1] 147945 [2] Submitted by: Joe Horn <joehorn@gmail.com> [1] Yuan-Chung Hsiao <ychsiao@ychsiao.org> [2] Feature safe: yes