Merge branch 'ignite-1.5' into ignite-1.5.1-2