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