Merge branch 'master' into CorePack
[CorePack] version "CorePack 20131212"
Merge branch 'CorePack' into pilot