Merge branch 'emberUpdate' into 1.6.x
fix regex responsible for identifying console logging
Merge branch 'issue733' into 2.0.x