Commit 003808b38cd09dab8748f93bb44a0df9aca6820c

Vicent Marti 2012-10-31T20:52:16

Merge branch 'config-refresh' into development