[#7] Fix for (at least) the Nexus 5
Merge remote-tracking branch 'origin/master'