diff --git a/.gitignore b/.gitignore
index 49527041a..700c19fe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,7 @@ bin
 build
 .gradle
 .springBeans
-.ant-targets-build.xml
 pom.xml
-src/ant/.ant-targets-upload-dist.xml
 *.iml
 *.ipr
 *.iws
diff --git a/build.gradle b/build.gradle
index 7b0ec481e..136964259 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,8 +100,8 @@ dependencies {
 
 javaprojects = rootProject
 
-sourceCompatibility = 1.6
-targetCompatibility = 1.6 
+sourceCompatibility = 1.5
+targetCompatibility = 1.5 
 
 javadoc {
   srcDir = file("${projectDir}/docs/src/api")
diff --git a/docs/src/api/javadoc.options b/docs/src/api/javadoc.options
deleted file mode 100644
index afd44d909..000000000
--- a/docs/src/api/javadoc.options
+++ /dev/null
@@ -1,11 +0,0 @@
--breakiterator 
--header "Spring Data Redis"
--source 1.6
--protected
--quiet
--docfilessubdirs
--group "Spring Data Redis Support" "org.springframework.data.redis*"
--link http://static.springframework.org/spring/docs/3.0.x/javadoc-api
--link http://download.oracle.com/javase/6/docs/api/
--exclude org.springframework.data.redis.config
-
diff --git a/docs/src/reference/docbook/reference/redis.xml b/docs/src/reference/docbook/reference/redis.xml
index ae3166a8e..0b354e6d8 100644
--- a/docs/src/reference/docbook/reference/redis.xml
+++ b/docs/src/reference/docbook/reference/redis.xml
@@ -421,7 +421,7 @@
   <cache:annotation-driven />
   
   <!-- declare Redis Cache Manager -->
-  <bean id="cacheManager" class="org.springframework.data.redis.cache.RedisCacheManager" c:template-ref="gemfire-cache">
+  <bean id="cacheManager" class="org.springframework.data.redis.cache.RedisCacheManager" c:template-ref="redisTemplate">
 </beans>]]>
   	
   	</programlisting>
diff --git a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java
index 313519837..e77088ce2 100644
--- a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java
+++ b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java
@@ -698,6 +698,10 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 	public <T, S> List<T> sort(SortQuery<K> query, BulkMapper<T, S> bulkMapper, RedisSerializer<S> resultSerializer) {
 		List<S> values = sort(query, resultSerializer);
 
+		if (values == null || values.isEmpty()) {
+			return Collections.emptyList();
+		}
+
 		int bulkSize = query.getGetPattern().size();
 		List<T> result = new ArrayList<T>(values.size() / bulkSize + 1);