merge master with develop

@hmunfru