Sync'd branch releases/aurora with upstream @ Tue Sep 23 20:06:35 PDT 2014