David update 20150719102720
David update 20150719102720

Fryguy/do-not-merge-wip-for-github,Fryguy/do-not-merge-wip-for-github,sanemat/do-not-merge-wip-for-github,Fryguy/do-not-merge-wip-for-github,sanemat/do-not-merge-wip-for-github,sanemat/do-not-merge-wip-for-github