Sync'd branch integration/b2g-inbound with upstream @ Sat Oct  4 08:28:41 PDT 2014