Some updates after a SensiolabsInsight scan
Merge remote-tracking branch 'origin/master'