Merge branch 'lime124-patch-1'

data.csv

@@ -3,7 +3,6 @@ Runscope,16,16,16,,https://twitter.com/johnsheehan/status/587077431237996544,,,
 Chef Software,12,12,12,"Fully paid also 12 weeks for taking care of sick spouse, child, parent", Chef HR Policy Docs,,,
 AeroFS,14,14,14,"10 weeks 100% paid, 8 weeks 50% paid. 10+ weeks additional unpaid.",https://www.aerofs.com/blog/parental-leave-at-aerofs/,,,
 FermiLab,0,0,0,,,,,
-Mozilla,14,2,2,"Numbers are for US employees. Not sure adoption number is right, but it is the 'non-child-bearing parent' number. Also PTO stops acruing during this time and it's excluded from bonus calculation.",Internal Wiki,,,
 Google,22,7,7,cash bonus ($700/week for food),[email protected],,,
 Twitter,20,12,,,[email protected],,,
 Reddit ,17,17,,,[email protected],,,
@@ -37,3 +36,4 @@ Salesforce,11,4,4,"4 weeks paternity or adoption at 80%, 11 weeks maternity at 8
 Travis CI,20,20,,"For US employees: 20 weeks at full pay, starting two weeks before due date, 24 weeks if there are complications during birth.",http://blog.travis-ci.com/2015-08-11-our-maternity-and-paternity-leave-for-us-employees/,2015-05-07,2015-08-07,2015-08-11
 Cisco,12,12 or 17,4 or 12, "1 week paid and 11 weeks unpaid parental leave per rolling 12 months. This includes all other FML categories too.  Birthing parent can extend to 17 weeks unpaid if there are medical issues. Adoption is 4 weeks paid but can be extended to 12 weeks unpaid for bonding."
 Wikimedia Foundation,8,2,2,6 weeks paid for California residents per CA law,officewiki,,,
+Mozilla,2,14*,2,"Numbers are for US employees. Not sure adoption number is right, but it is the 'non-child-bearing parent' number. Also PTO stops acruing during this time and it's excluded from bonus calculation. * The total maternity leave you can get is 15 weeks but the first week is either PTO or unpaid. After that, the next 12 weeks are considered maternity leave, followed by an additional 2 weeks of parental leave (which any new parent is eligible).",Internal Wiki/personal experience