Sync'd branch releases/aurora with upstream @ Fri Sep 12 12:20:34 PDT 2014