mh - fixing issue related to using gm of iOS 7
Merge remote-tracking branch 'origin/master'