cezaraugusto merged 2 commits into master from accessibility/7848 Apr 20, 2017