Merge tag 'v1.3.1' into v1.3.x

Whoohoo, 1.3.1
Fixes whitelist to work in release mode.
Updating white-list to latest files, code reviewed by @atnnn over the shoulder
Resolving white list conflict -- code reviewed by @atnnn over the shoulder