re #636 - Add 5317 to v2 stage
Merge branch 'master' of git.assembla.com:timble-police.2