Update to 20160118 snapshot
PR: 206419 Submitted by: myself Approved by: <darcsis@gmail.com> (maintainer, timeout > 2 weeks)