add c
Merge tag 'release/staging/2014-05-15.1' into production

2014-05-15 staging release
Cut from master

Generation 2