Merge changes from MacBook Pro

Signed-off-by: Kare Nuorteva <kare.nuorteva@me.com>