Changed Executor.queryForList to be more specific on the return type
Merge remote-tracking branch 'origin/master'