Sync'd branch integration/b2g-inbound with upstream @ Sat Oct  4 19:38:43 PDT 2014