Merge remote-tracking branch 'remotes/armbru/tags/pull-backends-2016-04-15' into...