Merge branch 'hotfix/20140509-misc'
eroantenna
Merge branch 'hotfix/20140510-eroantenna' into develop