Merge branch 'master' into deployment

fde8787a6 Generic velocity filter
59b1fd235 Add generic pattern filter to replace ad-hoc ones

Change-Id: If885f9d5d357ca654021375ee2c10d6b13f451ce