Merge branch 'master' into CorePack
[CorePack] CorePack version 20140129
Merge branch 'CorePack' into CorePack_mysqli