Merge pull request #242 from Wikia/release-15

Release 15
Merge branch 'dev'