Merge remote-tracking branch 'gsoc2016/Subtitle-1'