Merge branch 'develop'
Authored by: Johannes Binder 2014-03-19
Parent(s): [095b1a][e27148]
Child(ren): [ae971b]