AW13 updates
Merge branch 'aw13' of https://github.com/french-connection/stormsites into aw13