Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2