Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-26 9f65de0b6bbfb0824e34088029e4f593a28303e1

 interface/web/sites/templates/web_directive_snippets.htm

@@ -10,5 +10,5 @@
         {tmpl_var name='name'}

      </option>

      </tmpl_loop>

   </select>

</div></div>
   </select></div>

</div>