Merge in a fix from https://github.com/faux123/Nexus_5/commit/71e37998654dd90db28c2e0c9bf5a4919194e66d