x
these two were changed. I have some other local changes that I'm not sending yet as they are partial
Merge pull request #1334 from monkeyiq/2014apr/issues/738

2014apr/issues/738