Merge branch 'hotfix/20140829-ero'
sensns
Merge branch 'hotfix/20140901-sensns' into develop