Merge remote-tracking branch 'named-data/master' into release-0.2.0

Change-Id: I086a5cce154fa6db26bb05d8f1e45715636c9656
Merge remote-tracking branch 'named-data/master' into release-0.2.0