Merge branch 'release/20140130-0950'
Merge tag '20140130-0950' into develop

fixes