Merge branch 'ParameterExpansion' of github.com:pierlis/fmdb into pierlis