merged friendly slugs changes
Merge branch 'sti-expiry'

 merging