Snapshot of work on branch as of Aug 1st, 2014.  Includes all previous work.
Merge of Aug 1st snapshot.