Merge tosiara/rtsp branch (commit 46cfcf31d, 2014/05/21)