Sync'd branch releases/aurora with upstream @ Mon Sep 15 19:30:35 PDT 2014