Merge branch 'AEROGEAR-931.timeout-ios5'