Warnings
closes #934
Merge branch 'origin/master'