Merge branch 'release/20140118-1210'
Merge tag '20140118-1210' into develop

basic