Sync'd branch integration/b2g-inbound with upstream @ Sat Oct  4 07:13:42 PDT 2014