JBTIS-245 - update for luna master until beta3 arrives
Merge pull request #203 from pleacu/JBTIS-245

JBTIS-245 - update for luna master until beta3 arrives