Sync'd branch integration/b2g-inbound with upstream @ Mon Sep  8 12:15:09 PDT 2014