Fixed issue: 8136
http://hercules.ws/board/tracker/issue-8136-sera-pain-killer/
Merge remote-tracking branch 'upstream/master'