latest from upstream

Merged dcramer/master