LMW-64 Adapted code to iOS8 GM
Merge branch 'master' into LMW-64-ios8-gm
Merge branch 'LMW-64-ios8-gm'