closes #613 614 615 616
Merge remote-tracking branch 'origin/master'