Sync'd branch releases/aurora with upstream @ Mon Sep 22 05:36:33 PDT 2014