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