2014-01-22-14:15

Merged master and catapult2 branches.