closes 857
Merge branch 'origin/master'