Sync'd branch integration/b2g-inbound with upstream @ Sat Oct  4 05:14:16 PDT 2014