Added retry logic
Merge branch 'september-2013'