Review main Merged

14080[BUGFIX] Fix saltedpasswords unit-tests

Wouter Wolters CR +2 V +2 Easy +5 −5 updated 06/03/13, 20:49