Adaptive Images - (web/.htaccess not under source control)
Merge branch 'release/Release_AdaptiveImages'