7.x-1.1
c08b5ed8 · Merged from master · Jun 11, 2014