Temp fix for #96 by overriding shipped_opera_milestone
Merge branch 'development' into production