Merge branch 'dev'
Authored by: miguelnunes 2014-07-02
Parent(s): [58c46d][a5c985]
Child(ren): [6171d5]