Merge tag 'upstream/2017.01.22'
authorDon Armstrong <don@donarmstrong.com>
Thu, 6 Apr 2017 14:39:16 +0000 (07:39 -0700)
committerDon Armstrong <don@donarmstrong.com>
Thu, 6 Apr 2017 14:39:16 +0000 (07:39 -0700)
commit8d89fcbea21b7b5ff9e45c127b757d2a2b4cbc32
tree85324ba5640e86198a6fa43f5cb1dc6a24e048c4
parent393ed6aebb9add0a5ff89d0eed949fc2d128a3e8
parent2f099b3d7a8fc3854c4e693224259a4070d8632b
Merge tag 'upstream/2017.01.22'

Upstream version 2017.01.22