Code cfPassphrase / diff

313f19a Merge branch 'rc0.1' into develop

• Parent a982b697fcd1bedc6d3baa8f72ffa713f388c20f
• Parent 3844a970504120d3057a6f0da1bd8f29011815aa
• Authored by Peter Boughton at Sun 22 Feb 2015, 19:21