Merge remote-tracking branch 'origin/24480_colorbox_iphone' into develop