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