Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5