Sync'd branch releases/aurora with upstream @ Fri Sep 19 10:52:35 PDT 2014