Merge branch 'dev' into alpha
Authored by: miguelnunes 2014-10-03
Parent(s): [84649c][8b62f7]
Child(ren): [98c0c0]