From ed9d1414adb55e83bb839177ffa90be1ffba9cb7 Mon Sep 17 00:00:00 2001
From: ccancellieri <ccancellieri@hotmail.com>
Date: Tue, 25 Sep 2012 13:42:06 +0200
Subject: [PATCH] Merge branches 'master' and '1.4.x-issue-43-Selective-reload'