Merge branch 'hotfix/security-20140922'
Merge branch 'master' of bitbucket.org:claudinec/claudinechionh
Merge branch 'master' into dev