Merge branches 'master' and 'JBTIS-79' into JBTIS-79
JBTIS-79 - kepler beta1 update