am a6f4e65b: Reconcile with jb-release

* commit 'a6f4e65bc430e2481bf8e1aaff4b2743bfb261dd':