Merge development with production
Authored by: Rui Ferreira 2014-02-18
Parent(s): [19f067][354be9]
Child(ren): [6650d4]