Merge branch 'dev'
Authored by: miguelnunes 2014-06-30
Parent(s): [4cbfa6][a8f45c]
Child(ren): [19506b]