Merge branch 'master' into aws

lib/tools/phantomas/phantomasWrapper.js

@@ -47,7 +47,8 @@ var PhantomasWrapper = function() {
 
             // Mandatory
             'analyze-css': true,
-            'ignoreSslErrors': true
+            'ignoreSslErrors': true, // until Phantomas 2.1
+            'ignore-ssl-errors': true // for Phantomas >= 2.2
         };