Merge production with devel branches
Authored by: Rui Ferreira 2014-02-11
Parent(s): [22864a][eae7a7]
Child(ren): [f847bf]