[master, Mar-11-2013]

- Merge branch 'develop/features'