Merge pull request #988 from moaiforge/1.5-stable

1.5 stable
integration of development-1.5 with develop
re-merge with 1.5 merge from halfnelson