Merge pull request #4041 from CyberShadow/pull-20161129-100901