Commit 2014/7/30

Misc updates, see diff