Merge remote-tracking branch 'origin/master'

Change-Id: I717955bc5db4697b83cc1c4affcf6d9bfbc96f3f
Signed-off-by: mzfa <mzfa@mzfa-Ubuntu-1404LTS>
Merge remote-tracking branch 'origin/master'