Merge remote-tracking branch 'upstream/v1.4-stage' into v1.4-stage 3/head
authorL. D. Pinney <ldpinney@gmail.com>
Sat, 25 Feb 2017 04:01:44 +0000 (22:01 -0600)
committerL. D. Pinney <ldpinney@gmail.com>
Sat, 25 Feb 2017 04:01:44 +0000 (22:01 -0600)
commite5c4e4dab255306d87068209f490179a0e69cdb8
treea7e30b7cf681edcd3eb368c400e50260e56ac9fa
parentffe889d2c6f01ba31475923f345bcc063f26c04f
parentc0378f34c7f012b49fa8ca7507a1af78a90fc4c3
Merge remote-tracking branch 'upstream/v1.4-stage' into v1.4-stage