JCP up to 4.1
Merge github.com:david-deboer/msip-2014