Merge remote-tracking branch 'pozi/master'
20140913
Merge remote-tracking branch 'pozi/master'