Merge pull request #818 from apache/master

Update dev branch from master due to lstm alert fix