Sync'd branch releases/aurora with upstream @ Sat Sep 13 09:19:34 PDT 2014