Merge of 2.8.0

5/15/14 V-Day