Applied @stefanpenner patch to 1.7.0 -> "[workaround for #5606] o_0) apple what have you done.."
Merge branch 'stable_with_ios8_patch' into stable